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

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