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

Change-Id: I4de0a3e05a7e367b5cfb847e14f26078d75e71d0