am c67e89ad: am 30cea3dc: Merge "Fix minadb_test build breakage."

* commit 'c67e89ada5b8f549e8844e0b722d3310398bf4e8':
  Fix minadb_test build breakage.