Merge "Add shrinkedAndroid.jar to build tools" into oc-mr1-dev