Merge "make libprotobuf-cpp-* libs VNDK"
am: cd46573189

Change-Id: I2504dae4a287bc4ac1269229dca1cf7e4902c037