merge in klp-release history after reset to klp-dev
tree: 5c39d4cbcd40f0e879c5a38ce90928dadff5b252
  1. Android.mk
  2. chromium/