Merge "ART: Fix Makefile" am: a2ac43cdb0
am: c62f6970cb

* commit 'c62f6970cbd646946f0b38932e16d30ef711a77f':
  ART: Fix Makefile