Merge "Fix gcc+arm builds"
am: 74d7aa1c34

* commit '74d7aa1c341055474e03d2cc9af0aea01bfb5758':
  Fix gcc+arm builds