Merge "HC preview & GB 2.3.1 use platform-tools rev 2." into honeycomb