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
am: 944d078f
Change-Id: I460d18094ec83c5dfa220afeec9a3590cf755e24