Merge commit '6ffee9bbba53700d33456261b986ac8a3f333b9e' * commit '6ffee9bbba53700d33456261b986ac8a3f333b9e': Revert "resolve conflicts"
This dir contains tests which run on a host machine, and test aspects of package install etc via adb. To run, do: runtest framework-core-host