Merge "Update 'shrinkedAndroid' to not reference the sdk module name directly."