Merge "Convert tests mk file to bp."
am: 42f9abe0dd

Change-Id: I771896b70bdce808c3e262368ed1a29ffac98617