Shawn/android module update for 2020 patches

[ShawnW858]

cherry-picked all android related commits in 2020.

[google-cla[bot]]

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

[ShawnW858]

Thanks for doing this! Any merge conflicts/issues building?

luckily it's relatively straightforward. there are more to come (for 2021, 2022 patches)