Merge "Make viewcompiler available on device" am: eb678ba1d3 am: a3e9526ea8
am: 9f69619a97

Change-Id: Ic54866452468f545506afe487c326f377fbf382b