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

Change-Id: Ia130d94632d40f68e2c06c4959b6e7f3ad4edfba