Merge "Restrict dex2oat threads to 4 on android bots."
am: e6c8e3caa4

Change-Id: I7530be34449ff6093d572c3dfbf0e751606d7f5c