Merge "Update startup compilation thresholds"
am: f052aa7268

Change-Id: Ica71a35a9f3fe87872330609443778dcf3be9ed9