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

Change-Id: Ifee61a3040c59872cf7777e469c9beb27b5517f5