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

Change-Id: Ia03b392343c1b3b04ccebdc4cb4b0687eebfbd4b