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

Change-Id: I1690eaef3dac2a46b0d01ea7a7f88b49e1a8449d