Merge "fallout of libandroid.so split"