Merge "Sign each APEX with different container certificate"
am: 317acfe74b

Change-Id: I8af57c0c071fe327051f3eedc553e284be1a5915