Merge "ONE: Move OTA_ASSERT_DEVICE to BoardConfig" into froyo