Merge "Add PRODUCT_IOT to the list of product vars."
am: e90295014f

Change-Id: I1f41687a0e747765baa07931035b360977683837