Merge "ARM/ARM64: Clean up Baker RB introspection codegen."
am: 34be5e212b

Change-Id: Ia9ce3a1a027dd9dcbbd5cf69b401928afd8cec8e