Fix backwards compatibility issues with compat lib.

Change-Id: I3e8aa2601ed2b8d039ded073d3fa6b6865991126
20 files changed