Also removes unnecessary overrides from PictureDrawable. Change-Id: I13539b5204e8c0d8b9912da14de7ceae62720e3f