Merge "Re-order assignments in BaseDexClassLoader constructor."
am: 54be7bfba3

Change-Id: I1a45aca48571e777ad8e0bf38b5a7c5c8f0f4ac4