Merge \"Use BOARD_USES_VENDORIMAGE to detect vendor image presence\"
am: 5d420e791b

Change-Id: I3a65ccc6bc5d6b3c63484baaa6d816939bd48073