MediaRecorder: Fix unneeded deviations from AOSP and add all BEGIN/END Privacy brackets

This will likely be a real hassle when I try and merge my other local branches from the
merge. TODO: every file in the patches...