Fix:port/android:Revert r4975 due to incomplete commit.