Merge "Use new naming scheme for TARGET_PLATFORM_VERSION" am: 53d66b5903  -s ours am: 8a378154dd
am: 6b7e8efbfc  -s ours

Change-Id: Ie6f83be45b1fd266d1f358122875d1ad08151418