Details
Description
Several of the changes in the original Android commit have been abandoned (see gerrit). We can remove these from the commit before rebasing it, but we also need to revert them in the wip/android branch so that we can check that removing them does not break anything important.