Merge "Add missing LOCAL_C_INCLUDES"