Merge "NDK: fix undefined behavior"