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

Change-Id: Ida0e15e6943897d0a16d23ddacaca07f3c60f32e