Merge "Use shrinkedAndroid.jar from OUT for build tools"
am: b959fe4863

Change-Id: I3fb7d98d89970c4117604a8467fa7dcaa4d933d0