Back merging due to audio make errors as other project dependency during AOSP

Change-Id: I978b93bc5ed5dd06f42d029c36fee0d51e8f6fcb