Merge "Add shrinkedAndroid.jar to build tools" into oc-mr1-dev am: 77f7337943  -s ours
am: b7b8d145f8  -s ours

Change-Id: I35af91e612d5b945764668903cce342e424a7071