Merge "Implement getRemoteType of IBluetooth.aidl" into jb-mr2-dev