merge in jb-mr1-release history after reset to jb-mr1-dev
tree: 339dd6044eaa0b941afb210b8dff7df22c5db313
  1. alsa_sound/
  2. libalsa-intf/
  3. Android.mk