Update Oslo

Change-Id: Iac9d8b7fe109fe121ffe0d74ae2eef94db90b02a
Code cleanup

- Mark static methods
- Remove some useless code

Change-Id: I89f5829c75b874fdfe59bc88dad809e0d54b006a
Signed-off-by: Julien Danjou <julien@danjou.info>
Merge "Update Oslo"
Merge "Code cleanup"