DO NOT MERGE Revert "Add support lib version meta-data to AndroidManifest.xml" am: c1706b062a  -s ours
am: 4d9abae35b  -s ours

Change-Id: Ie6110fe6e34512ceee72be45ce59e78e75f49feb