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

Change-Id: I381d0e8777642c544ae8d0d45f2d43e506fe7c6f