Merge "Make apks depend on their certificates" am: f0a465c2cb am: f562875d0c
am: e855fd6a59

* commit 'e855fd6a59e66c83e152dd128adc2a49254ca289':
  Make apks depend on their certificates

Change-Id: Ie5dd09ebe8d5d2b8f7be36db176b293c96ddd594