This reverts commit 05c25ccb. Reason for revert: broke absolute OUT_DIR Bug: 146437378 Change-Id: I523ed79d40e1c1ef040212ba794a7a084abea75d