Merge "Add new dexopt flag to control hidden API restrictions" am: 37ea948a17 am: 6a278f573f
am: 7405487885

Change-Id: I35cc017cabcd384969b8e01e37155533e6231db0