am d846b1b5: (-s ours) am 8eed3b9d: am 53f6e572: Merge "Stopped bcc from ignoring optimization level"

* commit 'd846b1b5eb36d65d5a20c7ef895b2448acdf85ef':