Merge "Convert tests/ProtoInputStreamTests/Android.mk file to Android.bp"