am 649eb9bf: Merge "flounder: make aosp_flounder a 64-bit build" into klp-volantis-dev

* commit '649eb9bf54db67debc03106f8119a1d3b08a44a6':
  flounder: make aosp_flounder a 64-bit build