Merge "Add support lib version meta-data to AndroidManifest.xml"