resolve merge conflicts of 1c19363 to cw-e-dev

Change-Id: Iba2d0c5b4949e4d5d4b8810123d5229d8543991b
tree: 1d1ce60f3fa00f365e78a93d2480942cb2be969e
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE