merge from donut
tree: 45132009b8b6d63e58a6492c9ead5fb0ba74d36d
  1. sta_dk_4_0_4_32/
  2. Android.mk