Merge "Remove option for non-pic dex preopt." am: c184ef515c am: ffb29d7497 am: 8a02582f70
am: 9c12edb654

Change-Id: I920d75a84beaa69394a955c2931f5b7a5579bbb7