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

Change-Id: I38169c42b5b5600c0e3d00f0342429b3843f88f8