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

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