automerge: d17218e
* commit 'd17218e7df24da8a2bcf6e7714dc0151155c3286':
Fix issue #18901214: APR: Frequent crash in android
automerge: d17218e
* commit 'd17218e7df24da8a2bcf6e7714dc0151155c3286':
Fix issue #18901214: APR: Frequent crash in android