Replace package variant specific APK keys with a single one. am: 6da456969b
am: 7dbdae85df

Change-Id: I482ce987ff5ce6ba64be37a7bb305164bdbb4d2c