The framework version header has deviated from supportlib version long ago, and we shouldn't hack our theme to make this layout work. Instead we now have a custom layout compatible to settings theme. Fixes: 128833223 Test: visual Change-Id: I83087352240de183b0639daf844bd7f90e02056a