fix handling package_name for C++ am: 0ec22385b1
am: e1e138fef3

Change-Id: Ib83e120699023c4bf5601a33884fef176ea138ea