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

Change-Id: Icb24a573d5f1ccf6b72ee486b61bdf7baa7aad3a