Merge "add libadfhwc"