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

Change-Id: Ia73489f89bb0f04d2ef5e7b7053c2e211e73239a