am a4fb61a6: Merge "Forward additional drawable methods in AVD" into lmp-dev

* commit 'a4fb61a68eabd71bae9cbf58f0007704a1551aab':
  Forward additional drawable methods in AVD