Various API council fixes to drawables

BUG: 15089957
Change-Id: Ieaf468bbff092e68f6313d8a5ecccda8b753806d
6 files changed