Merge "General tidy up of android.system" am: 5cca1c7bc6
am: 6a19cb82fe

Change-Id: I33a879389aa2d60a32a976a199a37136fc3f884a