Fix static analysis findings

Add annotations where we intentionally left out @Override and a brief
explanation.

Add synchronized keyword where needed by overriding methods so they
match the parent class.

Change-Id: I55591a5902530f1c2fb8cc89260c3df09648ec8e
3 files changed