Merge "development: Update path to android.jar." am: 87cc3e369c
am: 7c9ea6b065

Change-Id: I5ee534d8ee7ffd676a75298695221c18b1ecff73