Merge "Add -DFLT_EVAL_METHOD=0 and -ffp-contract=fast" am: 800470e91d
am: 49fee737a2

Change-Id: I325f22fa2fd66e81884602bc49114de7d4de9c40