Merge "Enable -Wframe-larger-than=1728 compilation error"