Merge "Revert "[audiopolicy][enginebase] Fix schema verification""