am 315a1ef8: am e3e1d719: Merge "ART: Clean up some build flags"

* commit '315a1ef8f7ddf2348dbe117ff839427757c6ecff':
  ART: Clean up some build flags