Merge "anrd is moving from xbin -> bin" am: 2856475f49
am: e6b8637305

Change-Id: Ib696c78ce6a33303bca944aff6f06176123838c8