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

Change-Id: Ifb54b8061a70851a8989fae30466f87822e05943