Merge "updater_sample: Use stubs libs for android.test.base / runner." am: d97b643de4 am: 23d17302b1
am: e7248bef4e

Change-Id: I8566e16549d7057fa6ffaade8c31b3591512e99d