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

Change-Id: I7a029b45d902d263a04efb0c6754bfb0a5798cde