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