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
am: baa351ef
Change-Id: Ie85177ec6297e3579eb7cdace7402e0b00b69d8b