Merge "init: Increase buffer size for serialno and other properties set from kernel command line" into ics-aah