Revert some changes made ​​by Samsung.

Keeping the additional files, trying to avoid future conflicts.

Change-Id: Ib1ac0c5aa221828c092c63be3ca5b2187febeb39