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

Change-Id: I68ed7a7883ccefbe7860a2abfa9b0454f6b3e9f2