Merge changes I06ee0b67,I914d2205

* changes:
  Print out shared app gids correctly
  Add tests for Android-specific stubs