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

Change-Id: If96d1a6b829a67f2ecf8783b80bfe0a492508b4e