Merge "Fixing Android Net Test compilation"