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

Change-Id: I9488078944302098ba37797fe4b2574b814b2a62