am 38aa6093: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '38aa60937194889ae56fef52f2d4aa093d25f354':
  Revert "add coreboost feature and enable it when display is on"
  add coreboost feature and enable it when display is on
tree: 0cb996b63abcfe07120bd3e6f3cc9977115b69a4
  1. Android.mk
  2. power.c