Merge "Update the NDK compatlib for 4.4.4 and ToT."