Merge "Remove obsolete include path from makefiles"
am: 4d4544391f

Change-Id: I3a2df82bcd4a0212bbe13ac02d9eec4cadaf3a77