Merge "Add aquilescanta to media apex module owners" into rvc-dev am: 7987ac8045 am: 7d9780bac1

Change-Id: I803a49d3c420f1bc4f474a990c18dab2008cfb8b