Merge "Add "provide_cpp_shared_libs/uses" props to "apex"" am: db7a770509
am: 6a6f19e724

Change-Id: I9e096c0d180644cb208d0541fea73221f871803f