Merge "Change assets to use 64-bit API"