frameworks_native: revert cm changes

Change-Id: I582b6f3d310aafb0f0f214fab3297a1c1ef61069