Merge "Add proper number of stubs for ARM JUMP24 relocations."