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