Merge \"ART: remove ART_JIT makefile variable\"
am: 8481f6390a

Change-Id: Id4cf81cfe8547ea03f09a2d1e4d592d58e9725a7