Merge "Prepare frameworks/native/services/audioflinger"