Merge "Merge "media: avoid recursion when evaluating profile support" into nyc-dev am: a72a83a172 am: c4da6b9962" into nyc-mr1-dev-plus-aosp
am: 81dd1856ba
* commit '81dd1856badd22b88a44fc72aba12ecb83ab5824':
Change-Id: I60d4ba408260bf5cd0cb005604c4193f2018cd9d
This commit is contained in: