Don't use sed -i, it requires an argument on mac and is eating the
-e parameter, which causes the command to not be applied.
Also clean up the temporary list files so they don't clutter up
$OUT.
Test: m -j device-tests
Bug: 64226094
Change-Id: Ie71820fc2d1cd812717bf0c156af011ca723e9f6