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

* commit 'ea874f8fb70e98f5595ab2d582c31e9d79f300f7':
  Fix minadb_test build breakage.