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

Change-Id: I43093bf243cb249ad892bdf94ea9781ca734e239