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

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