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

Change-Id: I3be9b03f70035ceec16023d3be71dbd4584e52ba