Merge "add default cpu.active power consumption" am: c13747693f am: d3859f38b0

Change-Id: Iedce34a5f0b0dfa3b1959b580aed345e65c1dfd5