am 6e69feed: Merge "allow APKs to be signed with multiple certs" into ics-factoryrom

* commit '6e69feed1a3d57d3206f7dabe32e06e8b07189e2':
  allow APKs to be signed with multiple certs