Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I0ad19de3c7257a3de2856516cba132d8b7acb23b
Add certs to blacklist.

Change-Id: I34040b2fe12f81dc0e40653c635f061c499f815b
am c4c8087c: Add certs to blacklist.

# Via Geremy Condra
* commit 'c4c8087cad0aa18dc808d4f7058855f26891d935':
  Add certs to blacklist.
Merge android-4.2.2_r1 into dev-mips-jb-mr1