Merge commit 'f30a559fadcc54e4c4c45f0cf28ba6f376e6ecde' into merge

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