Merge "Support Android.bp in mgrep"
am: 1ee0fa0d35

Change-Id: I745a44a41afa173f5320d1bc85a51f6573a0e2fb