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