am 82d11f8e: Merge "MediaMuxer: Add setLocation API" into klp-dev

* commit '82d11f8e94e38e434cb6bc5e3e8d87250956fa1c':
  MediaMuxer: Add setLocation API