DO NOT MERGE Provide OMX/xaac Interface
am: 234b6925a2

Change-Id: I97796c6ef36d0d42e9c91553fe40c2034c88ea98