Merge changes I6096d12a,I5596f392

* changes:
  libaudiohal@aidl: Process screen state and rotation parameters
  libaudiohal@aidl: Refactor Android.bp files and reformat tests