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