Merge "Improve "adb install" diagnostics." am: a16ae8717c
am: 66321bc889

Change-Id: Id3e873dff8f91329a882b522eb3e1ef87d98bbdd