Merge "Remove FastJNI optimization on AssetManager to avoid dead lock." am: 4904e7ae2a
am: 07acbea653

Change-Id: I0087c756987e31f45a66928e60e5d8d53e26945a