am b1f94ef3: Merge "media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams" into klp-dev * commit 'b1f94ef3': media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams