am b1e240d8: am d46e6e37: am c0ed1282: Merge "Update libpowermanager to expose enum and export headers."

* commit 'b1e240d88935ddc76ce37acffeb4515e8b70ebe4':
  Update libpowermanager to expose enum and export headers.