merge in klp-factoryrom-release history after reset to klp-release
tree: 778469a53e06ef87ddba3ae6553b765c42b128a6
  1. chromium/
  2. Android.mk