Merge "Fix Framework core tests import of android-common."