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

Change-Id: I4112dd5bf087deeac2734ab5c58788640fad4c48