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

Change-Id: Idbd30b4a58ec4bb453826e1ae8a638fd79f42e8c