Merge commit 'e817eb7f46586b506ba8b214d356eed23d0670cf' into merge_work

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