SamsungExynos4RIL - Revert cleanup for use with opensource libril