Add a platform version for API level fixes
am: 173e30685a

Change-Id: Ied38ceb00414f2777db3f5be54ccb9f2c7dd5f19