Merge "Add manifest attribute for multiArch apps."