[automerger skipped] Merge "Convert tests mk file to bp." am: 42f9abe0dd am: 1a8d0e5779
am: 95115bd329 -s ours
am skip reason: change_id Ie1a7d873c0da70180c159ac8ca50b93edf37da12 with SHA1 16237d2d7c is in history

Change-Id: Ic5a24cd6e8fa599c67e727bd4e681cc81b32e52d