The override keyword is not supported in GCC 4.6

Change-Id: I32293346ba31fa90694f23a37500428658f52d31
More fixes for GCC 4.6

Change-Id: I8724db48bae8bc71347155badc33aef62f1024a4