Fix Android issue 58602

Google will fix this in the next SDK release but this is high impact enough that it's probably useful for other HoloEverywhere users.

For more details see:
https://code.google.com/p/android/issues/detail?id=58602

If Google's fix is different from this one you should remember to revert this commit when integrating Google's changes.