Fix handling of backwards compatibility - broken in AOSP too?
Merge pull request #5 from jduck/master

Fix handling of backwards compatibility - broken in AOSP too?