merge from donut
tree: 41d8d2a469e57f17cc3450498de45fc7b6f1c0ee
  1. sta_dk_4_0_4_32/
  2. Android.mk