Merge changes 2023,2036 into donut

* changes:
  Update more references to openInputStream in support classes. Continuation of bug 1846343
  Modify AudioFlinger to use updated openInputStream factory method. Continuation of bug 1846343