Merge "Unify audio element loop abort criterion in ER syntax" into pi-dev am: 28234107a7
am: 4a6124d231

Change-Id: I12aa62bfe5cc0c2900e6eb0e5427dba5f8a40068