Merge "Bump frame size limit 8 bytes to fix x86_64 build with latest external/libcxx"