Merge "Function to grep AndroidManifest.xml files." into jb-mr2-dev