osi: add native wakelocks to metrics

Metrics were only being counted for callout wakelocks.
Move metrics collection to the wrapping functions to account more
centrally.

Change-Id: I772198c3ae05bcb83965420931ddee87b1996b6b