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

Change-Id: I6a6e1a1bdf12c9fb521a69b93af3b213ebe1e495