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

Change-Id: Icc2f93cf7751223f3010231edf932e5c036ffd65