Merge changes Ia4ed05ba,I7b04b546,I4436cb1a,Ifeb61e24,I8005e6fa, ...
am: adaabc191a

Change-Id: Ia3e2dcef1a3c7631d1a37056745d56974fba5704
tree: 002fa1e7dbded349f2cfddfdc2a208143a2c270d
  1. qcwcn/
  2. Android.mk