Revert "Fix compilation issues for m_master merge into oe_master".

This reverts commit ecb67363ee73c0374424795ae6014a794065f5ab

Change-Id: I7b540247b246ea4caf710247d2c58b55515dae7c
20 files changed