Reconcile with jb-mr1-release - do not merge

Change-Id: Ie754a300e8665e6dfd25260714851d7bbe99261f
tree: 7102f0993e90834984c91e0d5beddc7f7a01f4ac
  1. alsa_sound/
  2. libalsa-intf/
  3. Android.mk