merge in klp-release (no-op)
tree: ca5160cda2266320d1b23327d46dd804e765c0dc
  1. Android.mk
  2. chromium/