Merge "Revert "Use shrinkedAndroid.jar from OUT for build tools""
am: 039d8dbd73

Change-Id: I5f3fc291eab9e2b5fc54d09b218e0fac6cf7836d