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

Change-Id: I019ee73860e6f3b2e7cedd16e657096842d54254