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

Change-Id: Iee2942bb2b8ce0874ea8bfed781368d8ac5284c8