Merge "FPII-2570: Adapt project to compile in Android tree." into fp/fp2_5.1_int