Android fix backport for release-1.3

[elgatito]

Closes #840

It is a backport of #571 .
Was tested with older Go (that is possible to be used for 1.3.*).

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: elgatito

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[elgatito]

@ahrtr @serathius @ptabor @spzala can we merge this one? That is still relevant for the reason listed in #840

[ahrtr]

Can you squash the commits and then signoff the commit, also raise a separate PR on main branch to add a changelog under https://github.com/etcd-io/bbolt/blob/main/CHANGELOG/CHANGELOG-1.3.md#v1313tbd? thx

[elgatito]

Can you squash the commits and then signoff the commit, also raise a separate PR on main branch to add a changelog under https://github.com/etcd-io/bbolt/blob/main/CHANGELOG/CHANGELOG-1.3.md#v1313tbd? thx

@ahrtr Thanks, I've squashed commits, signed them off.

And here is the changelog PR - #1241

[ahrtr]

/ok-to-test

[kubernetes-prow]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: ahrtr, elgatito

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment