am 2b270a0c: am a4ea1a3d: am f7e403d6: Merge changes I06ee0b67,I914d2205

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