Merge changes from topic 'cherry_pinner'

* changes:
  ART: Fix build break
  Add API for getting location of odex or oat file