Merge \"Bump frame size limit 8 bytes to fix x86_64 build with latest external/libcxx\"
am: 01273f154d

Change-Id: Id072fa99b1b3484d6f5823625424f607cab58555