Merge "Fix malformed Android change markers."