Merge "Fix ODR issue in viewcompiler" am: b9879d00c4 am: d1e12a6112
am: bf200e78a8

Change-Id: Ib8afbe33ef39a140e8d9855a13aa1296a6b5bd61