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

Change-Id: Ib9d689c7e8ac4eca802f694d6dbd902653eb84f1
tree: 848215b7a99366aba1896b2e7bc2357f97ac00c9
  1. alsa_sound/
  2. libalsa-intf/
  3. Android.mk