Merge "osu: remove calls to deprecated APIs"
am: e9514808d7

Change-Id: If7c31b7d901ef8cc8561b7f0933d803498105e75