Merge "Add support lib version meta-data to AndroidManifest.xml" into nyc-support-25.1-dev am: 702732a450
am: 9b456e0897

Change-Id: I394cf5d8821f0c549e0b3b756ae76146801e90ec