Mark methods as static where possible

Change-Id: I3de0d41c163f57ab7c6dcdd2bd58a01ca1da1808
11 files changed