am f7e403d6: Merge changes I06ee0b67,I914d2205

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