am 12ebfbcd: am 0c09d5b2: am e778ec89: Merge "Support arch-specific LOCAL_ variables"

* commit '12ebfbcd9daebda6ebace823ced79f795dd401d1':
  Support arch-specific LOCAL_ variables