Merge "Remove option for non-pic dex preopt."
am: c184ef515c

Change-Id: If76f8195ecb8b914fdea259de2e80ebebb5ebfe3