am f4716c59: Merge "frameworks/av doesn\'t need to support the long-dead simulator."

* commit 'f4716c59aa5eda29920ba718e8872c9ba20b4d28':
  frameworks/av doesn't need to support the long-dead simulator.