Merge "Revert "SurfaceFlinger: debug layer bounds inset"" am: bfe7d2873a
am: 6c437f1058

Change-Id: Ie6708e4907daefedfdf7e19c35555e254a2e13c6