Merge "rtcd: handle armv7s architecture"