change package
merge android changes