merge from donut
tree: 750d5bfa913544ddc4e7d819e7e0a898e02384ca
  1. akmd/
  2. .gitignore
  3. Android.mk