Gardening M38 : Android build fixes.

Various renames and moves.