Merge "Revert "flounder: make aosp_flounder a 64-bit build"" into klp-volantis-dev