am 81703a19: Merge "Support for product-specific dev keys." into ics-factoryrom

* commit '81703a19001ec219c35cb0ecf9bafb6e0dbc1e1d':
  Support for product-specific dev keys.