Merge "Update tests makefile for change." am: efbcd7de61 am: b56cfe36da
am: 59e5bd7589

Change-Id: I55e43110275be28b7ec29118c2655b271e9c33d5