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