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

Change-Id: I6e19c69504c03d1b708bc7eecd5fc85d6477b93f