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