Merge "Upgrade ABI package by the latest NDK r16b"