Merge "Minor cleanup - removing non-NDK shared lib."