Merge "Declare main outside of extern "C" block" into main