Merge "Prevent object of AudioEffect be deleted until construction finished" am: 637ee654cf
am: 1b201ee707

Change-Id: I853b081814fbe839f57a2b0da686a8e9651a67b6