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

* commit '2d06e69c31d33cc5d130b3c70a764bef0942cbba':
  Make RemoteController weakly referenced by IRemoteControlDisplay