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

Change-Id: I45f7279ee6a216fec15fcd2dd2337126d78bb684