Merge "For prebuilts, use the built_module for nostripping dexpreopt."
am: f90b7e1948

Change-Id: Id975f2ebaf3ce0f7e59544c47dc0a9ed80b0e2bb