Merge "Add sources read implicitly when building android.test.mock.stubs.source.test" am: ff2641428f am: 3105aee1ee

Change-Id: I1e9641981ae1048507d81f59b84a2a19ebe89d32