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