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

* commit '84bbe8b5a10fee84739dd020b62ac8b975ace5c0':
  ART: Fix Makefile