Clean up [1/2]

Change-Id: I0f12d5933b583f8ef7dd340e885ec1b426144bb5
Clean up [2/2]

Change-Id: I07b17f06fa17bc9c881d34a6609df1092f031536
Post Clean Up: Fix Sepolicy Build

Change-Id: Ie5807f4f5f5001987c4c07d9f8cc3e3a5e1ad17c