Merge remote-tracking branch 'origin/kitkat-dev'
tree: aa27a9a183a56a7be268a8f2d848680e5a984087
  1. Android.mk
  2. common/