Follow our own p880 || includes audio fix patch

Change-Id: I456f4b07c6b550bbf5d090fa188cf7cee9cdcc09