Merge "Build shrinkedAndroid.jar from SDK 20 API"
am: 6e979de7e8

Change-Id: I1f9ed5b72b8d7a505b1e2e885adb5310b1668b44