Merge "Use BOARD_USES_VENDORIMAGE to detect vendor image presence"