Resolve error-prone warnings.

Objects used for synchronisation should be final and inner classes
should be static, if possible.

Change-Id: I2be5bae504835660fad752048b2ab9c7076fafc0
Fix: 38442000
Test: Build
2 files changed