Merge commit '6b3d716e2b6472eb7189d3220552280ef3d832ce' into master

Selecting a revision for Trusty which is Python3 compatible

Bug: 197031257
Change-Id: I065223f0da9b83c042b9b0cb416f477db2ccbbe5
tree: 646ba61c4c34d4a0a742ddb053dce7f3f84f8ba7
  1. data/
  2. tests/
  3. thirdparty/
  4. tools/
  5. LICENSE.BSD
  6. LICENSE.GPL2
  7. README