Merge "Update build file for profilier" into oc-dev-plus-aosp