Merge "Update 'shrinkedAndroid' to not reference the sdk module name directly." am: 21127311 am: 777c960c am: f4e232bf Change-Id: I511e8de3243e252a25e620eaaf13e0f33888005f