Fix build, fix Drawable loop

Change-Id: I524b7f40c700ebe601fdbe80644a46e90ab2bba0
2 files changed