Merge "Support Android.bp in mgrep"