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

Change-Id: Ib7673ae60f48499a9e8c2bcb9973e5c2228ca00f