Android compile fixes

Merge request reports

Loading