Merge "skip building when BUILD_WITHOUT_VENDOR = true" into qt-r1-dev am: 937e0ec76d
am: 63bab3fffa

Change-Id: Ie88a9512aba773fd29367e9b8b523a156e3433f6