Fix issue with older structure sizes

When structures are enlarged in RS we need to use the script
API number to properly handle the older cases.

Bug: 19734267

Change-Id: I0ffd3dc4cea1640f2b14c588df3a93eee749e74e
6 files changed