Merge "Revert "Use shrinkedAndroid.jar from OUT for build tools""