Android 6.0.1 release 13
Merge changes I61375a73,Iffe85dd8 into mnc-dr-dev

* changes:
  Add pcm_get_poll_fd
  Export pcm_mmap_avail