Merge "Added rules to build 64-bit libraries for 64-bit emulator"