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

* commit 'a286db0b00f7ee46cf9215f8d40282fc9368ba5f':
  Support arch-specific LOCAL_ variables