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

Change-Id: Ida05b76c6ec81094d28ab3798f85843eaf119506