Simplify makefiles. [WIP]

Change-Id: Ia70dce1ba8a816a003587927e0b3a3f8ad2fd28c