Merge "libandroidfw: Make tests less flaky"