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

Change-Id: If998656c878286c6886a26387475be5b93422bbc