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