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