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