Fix using variable intermediates.COMMON before defining.

In commit e9dd9f2bf we moved "include $(BUILD_SYSTEM)/"
forward before the variable intermediates.COMMON gets defined. That's a
This change replaced the tentative variables
package_expected_intermediates_COMMON and guessed_intermediates with
their proper counterparts defined in
If their values differ in the two file, that's an error and we should

Bug: 18168693
Change-Id: I2bf17b0476b4a7f97810fbb0bde7630eb8878b53
2 files changed