Merge "libpower: add TEST_MAPPING" am: 6827114793 am: b9599c61dd
am: 53068026d1

Change-Id: I0b030150d0004b0b63bdf9353c63b5d53dbbdd00