Manually merged JustArchis commit 8e1b82c082a8de9160e6c0fc3ded37b591c3e517

See <https://github.com/JustArchi/android_build/commit/8e1b82c082a8de9160e6c0fc3ded37b591c3e517>