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

* commit '0c09d5b2ab36e1c188c40ee809e3d5e9cadc35a5':
  Support arch-specific LOCAL_ variables