Merge "Update libandroid.so for API9 .. API18"