Merge "Base: Add an NDK-compiled version of libbase"