am 14f98d5a: Merge from AOSP staging branch

* commit '14f98d5acdb00aea40550e80bc20a76e20257c3f':
  Generate fixed JOP40C factory images
  JOP40D factory images for Manta