Merge "Add shrinkedAndroid.jar to build tools" am: 1a9b850c50 am: a578e61335
am: 8f6ccd2e01

Change-Id: I58279783d9242b874d77147bc5770c204e3f62a5