Reconcile with jb-mr1-release - do not merge

Change-Id: I9083ad000467a93228455a796ffcd353f097a0d8
tree: 4d1cf7a2c366d85a06ec8c2ebc2704e7641129f8
  1. alsa_sound/
  2. libalsa-intf/
  3. Android.mk