Merge "ART: Fix Makefile"
am: a2ac43cdb0

* commit 'a2ac43cdb031980ceceee3b91d350d5530398018':
  ART: Fix Makefile