am 4d299a2c: Merge "Build all bionic test files -Werror and fix our one warning."

* commit '4d299a2cf7880789e658f427196d1ca9fe02a9bc':
  Build all bionic test files -Werror and fix our one warning.