Merge "Install all comp mat to system image"
am: 1612a3c27e

Change-Id: I349c292e1e43ebaf925d2b6e423d7927845c7d95