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

Change-Id: Id1fb5e44bc83a2382867aa5e022c4b73c016d974