Merge "More NDK generated libs support."