tree 9b537504303251deac186b2fcc8482f76271eb01
parent 1302ef89acfd232fa09a59e42a8ad39b6060193f
parent 7375a4732cb2c5a3d7b6fd2ceec75ed26643953d
author Ray Essick <essick@google.com> 1527292563 -0700
committer android-build-merger <android-build-merger@google.com> 1527292563 -0700

[automerger skipped] DO NOT MERGE Remedy CTS issues, enable DRC features for xHE-AAC am: f4aed3b367
am: 7375a4732c  -s ours

Change-Id: Iee2dc98b7ccdbd51f4ef9cc55483980c0c79b278