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

Change-Id: I813a94a9d38d14bcda2c915ffd34199ade625fca