Merge "Add shrinkedAndroid.jar to build tools"