Merge "HACK: Modify .mk files to avoid strict compiler errors" into audio-hal.lnx.4.0