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

Change-Id: I4a3da887d12d3d674e79610cd844015706d7c1b8