am 4f6d526d: merge from open-source master

Merge commit '4f6d526d602b115b6cd4f2cefbce3e091bdbd871'

* commit '4f6d526d602b115b6cd4f2cefbce3e091bdbd871':
  Set arm specific variables to be empty for non-arm platforms