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

Change-Id: I4ddbb337967a7e072d69d024fe7c92099e7dce4b