Merge "Use new naming scheme for TARGET_PLATFORM_VERSION"
am: 53d66b5903  -s ours

Change-Id: I6b5645bf8dfe62de83d0fcfd564ee83aa7e83d3d