Merge "Convert tests/ProtoInputStreamTests/Android.mk file to Android.bp" am: 4497c97891 am: 3036f3d732 am: 44dc35f254 am: 734ef1be41

Change-Id: Ia8851a031e31c6d5d649cd93f38c8e6d688c3eb4