Merge "Convert tests/ProtoInputStreamTests/Android.mk file to Android.bp" am: 4497c97891

Change-Id: Ibe72540a81e12beabeae6b6b0fed5af662d5cab2