[automerger skipped] Merge "Tidy up API build variables" am: 4fe6c0f8 am: 456b1dd7
am: 053144ac -s ours
am skip reason: change_id I3c85d17dd7405e65a6be9e60831b1a07e4f08abf with SHA1 bfb20575 is in history
Change-Id: If9e29deed9a373e30904e414f53bc759ddef127e