Merge "Only set TARGET_PLATFORM version in lunch when explicitly requested"
am: 4a3dc1458f

Change-Id: I4e91adff95d9a71b88c204783a1b1546433219c7