am 16ba2ed8: resolved conflicts for merge of 4c178ebc to lmp-mr1-dev-plus-aosp

* commit '16ba2ed82bc084d5355477a381cc0bcc8b60a7bd':
  Remove support of factory ramdisk/bundle.