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

Change-Id: I15c5c9f03f33a02a7f39e781e5e945fe5c74f4bd