Comment out overlays not yet present

Change-Id: I7d926fb0962634007e4a930e776c10a6e9241f1b
Remove deprecated build flags

Change-Id: If3d159faecae10ff6b99f1dd236b28a2435e2f29