Merge "misc: Tweak Android change documentation, revert redundant changes."