[automerger skipped] DO NOT MERGE Provide OMX/xaac Interface am: 234b6925a2
am: be8ecd6861  -s ours

Change-Id: I1e0564dd1e7fd1d464805f06744b0b0547ce0174