Bma/cleanup

Merged Benoît Marty requested to merge bma/cleanup into master

Some upgrade and cleanup of the Android part. Mainly coming from closed !42 (closed).

Merge request reports