Merge "Add error messages for wrong library names" am: 4068c3f8f6 am: 8950e7c37f am: 8be6e0e726

Change-Id: Ifde07ee4a2e9126b0d38d6a318632ed5341dc47e