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