Remove rpm from control files and add power:battery to control files.
Add cleanup() at end of test.

BUG=None
Test=None

Change-Id: I0234b9cef49897bf605f772c6c28a9dbc4cdc2af
Reviewed-on: https://chromium-review.googlesource.com/254120
Reviewed-by: Kalin Stoyanov <kalin@chromium.org>
Commit-Queue: Helen Zhang <helenzhang@chromium.org>
Tested-by: Helen Zhang <helenzhang@chromium.org>
3 files changed