Merge "Build audio.primary.default, audio.stub.default, audio_policy.stub with BOARD_VNDK_VERSION"