Merge "Fix struct vs. class mismatch in forward definitions"
am: 8cdcd15c38

Change-Id: If6768b8a9468833f0fec5025f95c1796dc2869ca