am 6b22a994: Merge "Hardware Composer Test Lib HBlen off by 1" into honeycomb

* commit '6b22a99481d8fadbd7f8c56b2c3b7dbc28ddd0de':
  Hardware Composer Test Lib HBlen off by 1