Cleaned up apt repository definitions

Change-Id: I0ec8698aa19bb8503e5d853d7bc52b3f5db06788
Merge "Cleaned up apt repository definitions"