Merge "Bring in more layout lib changes from hc-mr1." into gingerbread