am 228b3973: Merge "ART: Dex2oat lint fix"

* commit '228b3973b2b24783c727a55fda2b4b80375f7207':
  ART: Dex2oat lint fix