Rename some build variables and targets for the ART APEX. am: 84e5bb990d am: e224b212a0
am: 6b0b07767e

Change-Id: I076ca5356512b40aeec21f4241af7d33b0daa5fe