Merge commit '5d676ad5d94c3d4f831c2084012f955fe56a8af8' * commit '5d676ad5d94c3d4f831c2084012f955fe56a8af8': Enable proper cleanup of OMX nodes managed through stagefright.
Merge commit '5d676ad5d94c3d4f831c2084012f955fe56a8af8' * commit '5d676ad5d94c3d4f831c2084012f955fe56a8af8': Enable proper cleanup of OMX nodes managed through stagefright.