Merge "Convert tests/mocking/**/Android.mk files to Android.bp" am: 9f57efc080
am: 00e8101945

Change-Id: Iab1448953e79404f7a9df8c511bcc74b825fa927