[mq]: android-fixup