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

Change-Id: I3354345c16d6423d32218c363c1b7c58cd325d4f