Merge "Remove ; from closing namespaces in libs/hwui"