Merge "Adjust AsyncTask.THREAD_POOL_EXECUTOR config"
am: 2b56c4cf48

Change-Id: I0a8554c58710b162df57cbf2ca8dcb7591666ef9