Format hpp files according to new astyle rules

Change-Id: I629a23a968a9990693ce65d939148170b713ef19