Merge "Add per target archtecture properties" into master-soong