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

* commit 'ede325fe5a2beca79adac09f17adef7e9d72afaf':
  HC preview & GB 2.3.1 use platform-tools rev 2.