Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Iddfb8f231599cb4d38212670febe9048cc97b572
tree: bf0f47848a330918eece8f756ab9cf51eb687f4c
  1. alsa_sound/
  2. libalsa-intf/
  3. Android.mk