Merge "Update 'shrinkedAndroid' to not reference the sdk module name directly." am: 211273119b
am: 777c960ce0

Change-Id: I25c54f18e72a39262e373aa5565687d10b020691