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

Change-Id: I591c85e9c7b881d69ed281b8ba967fe7064c78c6