Merge "HACK: Export androidboot.modelno as ro.boot.modelno -- DO NOT MERGE" into ics-mr1