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

Change-Id: I6c4f10a47d0312697c8ed7be4c12c4a829446d65