am efa8118b: Merge "Update BuildVersionTest" into honeycomb

* commit 'efa8118bf2c508a53416a7f4b7bee278802702de':
  Update BuildVersionTest