Revert "Upstream to LK 3.0.101"

This reverts commit 5645aa7d236f72e8e83511d4cca8811c3f01b461.
Makefile: Remove unnecessary flag

Change-Id: Ia397401bf25703852af6ada45f2382bb07b240b8