Applying upgrade from @mwoz123
Applying upgrade from @mwoz123


17.10 was not building, upgraded via patch from @mwoz123.
Thank you for the patch.

Signed-off-by: Simon Egli <46f1a0bd5592a2f9244ca321b129902a06b53e03@egli.online>

Deadolus/android-studio-docker