Merge "Add no-macro-redefined CFLAG" into audio-hal.lnx.4.0