Merge "mime/Android.bp comment: Fix grammar." am: 65e6a23e40 am: a998969b16
am: 88f888c8db

Change-Id: I07e66d8b1a3344bde66e191aa987f36880698ccf