Cleanup system_ext changes

Change-Id: I4901ee02454722780751229e7ab52e744abc1402
2 files changed