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

Change-Id: I771cbe3461588fde6c02de23cdd80f198cca503f