Merge "Support LOCAL_JACK_ENABLED := javac_frontend" into oc-dev
am: ecfd048a8e  -s ours

Change-Id: Ie921d35e5dbaf3a3a49b6cfbc8763995ed7b8c2a