am ad71caf2: am 3b6da6bf: Merge "Move frameworks/av off private API."

* commit 'ad71caf25e31ecfc4ecf2c925e38fd87905fbc8e':
  Move frameworks/av off private API.