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