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

Change-Id: I6575a89f57cfb3ad44d2bb890fde200ba988af0c