Now with some help from Michael Stahl - seems to work.

Some more like Thorstens diff 9c59cd15

Done with some regex magic (and a check if this var is an array):

s/sizeof\(\s*$var\s*\)\s*\/\s*sizeof\(\s*\*$var\s*/SAL_N_ELEMENTS\($var/gs

have MappedLockBytes take complete ownership of the file handle and
unmap it and close it on release. Otherwise xFile will close it
and MappedLockBytes will unmap it in that order, which breaks
post android requirement to have a valid file handle in unmap

Don't de-reference invalid iterator (and no point in doing anything
with an empty style sheet list anyway).

some id and string renaming from b08e2730 was reverted, those parts of the changes are reapplied here

This reverts commit 83a28682.

- iterators should be compared with !=, not <
- iterator invalidation on erase should be avoided by using the
  iterator that is returned by erase
- in WrongList::operator== only one iterator was incremented