Merge "DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information" into nyc-dr1-dev
am: ad1008d089  -s ours

Change-Id: I061b3254230cb99b93995bc498d59efbfdb4e4e3