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

Change-Id: I91d3d033fcb1e0d4501bc65d79f6ab223b53b177