Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2