Merge "Turn off intel optimizations for host lib am: 4e88d040b7 am: 106a9f5260" into nyc-mr1-dev-plus-aosp