am f2177bae: am 2d06e69c: am c04337aa: Merge "Make RemoteController weakly referenced by IRemoteControlDisplay" into klp-dev

* commit 'f2177bae2da4c73bb2180efe154b3f7abb615370':
  Make RemoteController weakly referenced by IRemoteControlDisplay