am db4113fd: am d58df2de: Merge "Re-tighten default compiler options."

* commit 'db4113fdcce77872cc4657d74ac4136b356de928':
  Re-tighten default compiler options.