Fixed include paths for standard aosp based setup