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

Change-Id: If7f71a1c9a95e3e742c6cb9eaaab89c9d8a5ec21