Merge "init: Don't set ro.serialno when androidboot.serialno is not set"