Merge "include the arm header files in make dist" into cayuga