Overlay for stats collection on cm.

Change-Id: I3ecec3507cd617a41ac2c37c5892f3e8ed0261f5
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0