Merge "Add 32 / 64 bit abi lists to system properties."