Merge "Correcting include path in installd test project's Android.mk"