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

* commit 'e3e1d71901b8e7dc73938f2ff5be863277bbdb01':
  ART: Clean up some build flags