am 33c11ac3: am e1f37ba0: am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo

Merge commit '33c11ac3f150a388ebf2df80a42b577c136282de'

* commit '33c11ac3f150a388ebf2df80a42b577c136282de':
  Dist apkcerts.txt for unbundled builds