[android] dirty fixes required by EV3 plugin