Merge "Fix BIONIC_ROUND_UP_POWER_OF_2 for 64 bit."