Merge "Simplify libpower"
am: e9f8002117

Change-Id: I28fc49eda15688d4c240ead6ffd67082aad41720