Merge "app_main missing include for sys/stat.h"