[automerger skipped] Merge "fastboot: do not die if ANDROID_PRODUCT_OUT undefined" am: a7b0b3ba27 am: 5eb72a11e1
am: 863d330cf1  -s ours

Change-Id: Ib870ff47dba3c17e248d3a0758f1dc8b22399380