Merge change 20422

* changes:
  Build the stagefright library by default.