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

Change-Id: I9d54752d327f40aae1c505e51e6a36599b4de899