am a4ea1a3d: am f7e403d6: Merge changes I06ee0b67,I914d2205

* commit 'a4ea1a3d2e12f8b240a70d90ddf1f54af06c286c':
  Print out shared app gids correctly
  Add tests for Android-specific stubs