Reconcile with jb-mr1-release - do not merge

Change-Id: I029549918f3f7236eb5e058372221167d8618a70
tree: 640f655cd595f82ace4684488b369de235fb5ac8
  1. alsa_sound/
  2. libalsa-intf/
  3. Android.mk