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

* commit '30cea3dcaf1dcf4be9954178f67b4f8dff0fb9f9':
  Fix minadb_test build breakage.