Merge "Update startup compilation thresholds" am: f052aa7268
am: ca0bdbfb3e

Change-Id: Iff7ef4d0e5dbc46b82683914f1a48bb764cce38b