Merge "Increase thread pool for VHAL 2.1" into oc-mr1-dev
am: b96a339f5a

Change-Id: I29e6988539b95c24fc309f5ca5f166b8c8fd4702