Merge "Revert "Include 26.0 compat file on system image."" am: 00cac07f am: c1bd5c6b am: 005404eb am: 841a7ee6 Change-Id: I66f50ffb9a04b9df4be945683742db8d4f02b8a7