Merge "Rename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite" into stage-aosp-master am: da9d54c685
am: 13990db24a

Change-Id: Ie8cb522bd5291754f8caf803faf96095b1bf9cf2