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

* commit '4d45d6d8b0296bf6351ad02f9b607289d3cbaf22':
  Support "LOCAL_FDO_SUPPORT := always".