Merge "Add exported include dir for libandroid_runtime"