Merge "Add error messages for wrong library names" am: 4068c3f8f6

Change-Id: Ib25e0955556cbfe9f8068b12642ba4a11092a745