You win :)  Noticed some audio issues with BOARD_USES_QCOM_HARDWARE defined which are gone if I remove that from BoardConfig.mk.  Final cherry picks look good to me.