Merge "Make the error messages from the two APEX_MODULE_LIBS checks easier to...
Merge "Make the error messages from the two APEX_MODULE_LIBS checks easier to tell apart." am: 02e116ce
am: 2920698d
Change-Id: Id6f5d38bf42ac577935775aff0f89bc3a63046c2