Merge "Update tests makefile for change."
am: efbcd7de61

Change-Id: I4477b859167b1a6b787e18f2aa1bbf5886fc5a2a