Merge "osu: remove calls to deprecated APIs" am: e9514808d7 am: 30874ed6ed am: 0a5b88e286
am: 6966f450a2  -s ours

Change-Id: I786dfe46041dbf9c73e07b1fd20f9f720b3fbcb5