Merge "Fix ALOGVs for 64bit"