Update to use system/core/include 4.2.2_r1.2