Android Audio Fix

code review changes