Improve scrape shutdown even more.

Change-Id: I9dff1ee18616694f14b04408eaf1625d0f989696
Simplify makefiles. [WIP]

Change-Id: Ia70dce1ba8a816a003587927e0b3a3f8ad2fd28c