Merge "Cut dependency to libandroid.so"