Merge "Add hardware flag cc lib" into main