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

Change-Id: Ia2f75f5ddd7f07e9184a0c675fe8bed2ce7fea67