Merge "clean up warnings when building arm with rtcd"