Merge "Consolidate size compat bounds calculation" into rvc-dev am: 502b81a8ee am: 9cfa3b0610

Change-Id: Ibba1a9a1afb4e3d54d3b9921eef25157688a82ef