Merge "Annotate $classOverhead arrays."
am: e5e0e97998

Change-Id: I29ae56fea409d75c1ef8610284f004bb3e9988b1