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