Update Makefile and scripts after Quick removal.

Change-Id: I7610b34da337d81d9176ceca74e55ab85642a72b
4 files changed