manifest: Track CMs calculator for additional functionality

Change-Id: I526e53abcfcc179a0988c5757e2327eaee140896
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
Merge "manifest: Track CMs calculator for additional functionality" into jb-mr1
Merge remote-tracking branch 'aokp/jb-mr1' into jb-mr1

Conflicts:
	default.xml

Change-Id: I2daae4a783db6aa4d3825c7b1490d0964f4a378f