am b478d625: am 9db3e6c6: Merge "Support "LOCAL_FDO_SUPPORT := always"."

* commit 'b478d625f2f72440f239ec538fae167ede45f49e':
  Support "LOCAL_FDO_SUPPORT := always".