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

Change-Id: Ie0177174891b5cd3c81dcf76a5fd957d8fa50607