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

Change-Id: I744d6eb1191d4dd18e9bed6f2d738a1ba7a19562