Reconcile with ics-mr1-release

Change-Id: I08373a62e00ccc78cb09e193dd1c90a36daf50d9
tree: c4778fe02eff8c7f8512f7426fbd17648e4934e6
  1. include/
  2. Android.mk
  3. mixer.c
  4. pcm.c
  5. README
  6. tinycap.c
  7. tinymix.c
  8. tinyplay.c