Merge "Add librank2"
am: 713398f8bf

Change-Id: Ife31e37041cec494dcef0b335cc118918437b0ae