Merge "Android.bp: Add comment about APEX stub dependency for MimeMap." am: bb2531f16b am: 4eed4ccc56
am: 721f6371d5

Change-Id: I710fdebbb209615c3f22b835d27568cb44c4fde2